From cc6b34c1e32ac1ee79c0b2cbefc225386492843a Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 11 May 2001 17:13:44 +0000 Subject: [PATCH] docs, fixes bug #54144 2001-05-11 Havoc Pennington * gtk/gtkimage.c (gtk_image_new_from_stock): docs, fixes bug #54144 * gtk/gtkcolorsel.c (gtk_color_selection_new): docs, fixes bug #54330 2001-05-11 Havoc Pennington * gtk/tmpl/gtkvruler.sgml, gtk/tmpl/gtkhruler.sgml: fix bug #54431 * gtk/tmpl/gtkdrawingarea.sgml: fix bug #54331 * gtk/tmpl/gtkenums.sgml: fix bug #54329, and update some other random things * gtk/gtk-sections.txt: updates * gtk/tmpl/gtkmenuitem.sgml: fix bug #54277 * gtk/tmpl/gtkradiomenuitem.sgml: fix bug #54323, #54324, #54325 --- ChangeLog | 8 + ChangeLog.pre-2-0 | 8 + ChangeLog.pre-2-10 | 8 + ChangeLog.pre-2-2 | 8 + ChangeLog.pre-2-4 | 8 + ChangeLog.pre-2-6 | 8 + ChangeLog.pre-2-8 | 8 + docs/reference/ChangeLog | 17 ++ docs/reference/gtk/gtk-sections.txt | 45 ++--- docs/reference/gtk/tmpl/gtkcolorsel.sgml | 160 +++++++++++++++++- docs/reference/gtk/tmpl/gtkdrawingarea.sgml | 2 +- docs/reference/gtk/tmpl/gtkenums.sgml | 52 +++--- docs/reference/gtk/tmpl/gtkhruler.sgml | 2 +- docs/reference/gtk/tmpl/gtkimage.sgml | 27 +++ docs/reference/gtk/tmpl/gtkmenuitem.sgml | 2 +- docs/reference/gtk/tmpl/gtkradiomenuitem.sgml | 10 +- docs/reference/gtk/tmpl/gtksignal.sgml | 36 ++-- docs/reference/gtk/tmpl/gtktextbuffer.sgml | 10 ++ docs/reference/gtk/tmpl/gtktextiter.sgml | 45 +++++ docs/reference/gtk/tmpl/gtktypeutils.sgml | 8 +- docs/reference/gtk/tmpl/gtkvruler.sgml | 2 +- docs/reference/gtk/tmpl/gtkwidget.sgml | 9 + gtk/gtkcolorsel.c | 2 +- gtk/gtkcolorsel.h | 4 +- gtk/gtkimage.c | 4 +- 25 files changed, 409 insertions(+), 84 deletions(-) diff --git a/ChangeLog b/ChangeLog index c705940b16..0cebe4172c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-05-11 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_new_from_stock): docs, fixes bug + #54144 + + * gtk/gtkcolorsel.c (gtk_color_selection_new): docs, fixes + bug #54330 + Fri May 11 02:53:57 2001 Tim Janik * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c705940b16..0cebe4172c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2001-05-11 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_new_from_stock): docs, fixes bug + #54144 + + * gtk/gtkcolorsel.c (gtk_color_selection_new): docs, fixes + bug #54330 + Fri May 11 02:53:57 2001 Tim Janik * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c705940b16..0cebe4172c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2001-05-11 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_new_from_stock): docs, fixes bug + #54144 + + * gtk/gtkcolorsel.c (gtk_color_selection_new): docs, fixes + bug #54330 + Fri May 11 02:53:57 2001 Tim Janik * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c705940b16..0cebe4172c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2001-05-11 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_new_from_stock): docs, fixes bug + #54144 + + * gtk/gtkcolorsel.c (gtk_color_selection_new): docs, fixes + bug #54330 + Fri May 11 02:53:57 2001 Tim Janik * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c705940b16..0cebe4172c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2001-05-11 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_new_from_stock): docs, fixes bug + #54144 + + * gtk/gtkcolorsel.c (gtk_color_selection_new): docs, fixes + bug #54330 + Fri May 11 02:53:57 2001 Tim Janik * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c705940b16..0cebe4172c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2001-05-11 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_new_from_stock): docs, fixes bug + #54144 + + * gtk/gtkcolorsel.c (gtk_color_selection_new): docs, fixes + bug #54330 + Fri May 11 02:53:57 2001 Tim Janik * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c705940b16..0cebe4172c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2001-05-11 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_new_from_stock): docs, fixes bug + #54144 + + * gtk/gtkcolorsel.c (gtk_color_selection_new): docs, fixes + bug #54330 + Fri May 11 02:53:57 2001 Tim Janik * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index d59095b692..d42afca31e 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,20 @@ +2001-05-11 Havoc Pennington + + * gtk/tmpl/gtkvruler.sgml, + gtk/tmpl/gtkhruler.sgml: fix bug #54431 + + * gtk/tmpl/gtkdrawingarea.sgml: fix bug #54331 + + * gtk/tmpl/gtkenums.sgml: fix bug #54329, and + update some other random things + + * gtk/gtk-sections.txt: updates + + * gtk/tmpl/gtkmenuitem.sgml: fix bug #54277 + + * gtk/tmpl/gtkradiomenuitem.sgml: fix bug #54323, + #54324, #54325 + 2001-04-26 Havoc Pennington * gtk/tmpl/gtkimage.sgml: document GtkImageType diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 4e5b743ff3..455a2052a0 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -363,18 +363,24 @@ GtkColorSelection GtkColorSelection gtk_color_selection_new gtk_color_selection_set_update_policy -gtk_color_selection_set_use_opacity -gtk_color_selection_get_use_opacity -gtk_color_selection_set_use_palette -gtk_color_selection_get_use_palette +gtk_color_selection_set_has_opacity_control +gtk_color_selection_get_has_opacity_control +gtk_color_selection_set_has_palette +gtk_color_selection_get_has_palette +gtk_color_selection_get_current_alpha +gtk_color_selection_set_current_alpha +gtk_color_selection_get_current_color +gtk_color_selection_set_current_color +gtk_color_selection_get_previous_alpha +gtk_color_selection_set_previous_alpha +gtk_color_selection_get_previous_color +gtk_color_selection_set_previous_color +gtk_color_selection_is_adjusting +gtk_color_selection_palette_from_string +gtk_color_selection_palette_to_string +gtk_color_selection_set_change_palette_hook gtk_color_selection_set_color gtk_color_selection_get_color -gtk_color_selection_set_old_color -gtk_color_selection_get_old_color -gtk_color_selection_set_palette_color -gtk_color_selection_get_palette_color -gtk_color_selection_unset_palette_color -gtk_color_selection_is_adjusting GTK_COLOR_SELECTION GTK_IS_COLOR_SELECTION @@ -973,6 +979,7 @@ gtk_image_get_image gtk_image_get_pixbuf gtk_image_get_pixmap gtk_image_get_stock +gtk_image_get_animation gtk_image_get_storage_type gtk_image_new_from_file gtk_image_new_from_icon_set @@ -980,12 +987,14 @@ gtk_image_new_from_image gtk_image_new_from_pixbuf gtk_image_new_from_pixmap gtk_image_new_from_stock +gtk_image_new_from_animation gtk_image_set_from_file gtk_image_set_from_icon_set gtk_image_set_from_image gtk_image_set_from_pixbuf gtk_image_set_from_pixmap gtk_image_set_from_stock +gtk_image_set_from_animation gtk_image_new gtk_image_set gtk_image_get @@ -1320,7 +1329,6 @@ gtk_menu_bar_new gtk_menu_bar_append gtk_menu_bar_prepend gtk_menu_bar_insert -gtk_menu_bar_set_shadow_type GTK_MENU_BAR GTK_IS_MENU_BAR @@ -2095,6 +2103,7 @@ gtk_text_buffer_apply_tag gtk_text_buffer_remove_tag gtk_text_buffer_apply_tag_by_name gtk_text_buffer_remove_tag_by_name +gtk_text_buffer_remove_all_tags gtk_text_buffer_create_tag gtk_text_buffer_get_iter_at_line_offset gtk_text_buffer_get_iter_at_offset @@ -2138,6 +2147,8 @@ gtk_text_iter_get_offset gtk_text_iter_get_line gtk_text_iter_get_line_offset gtk_text_iter_get_line_index +gtk_text_iter_get_visible_line_index +gtk_text_iter_get_visible_line_offset gtk_text_iter_get_char gtk_text_iter_get_slice gtk_text_iter_get_text @@ -2167,7 +2178,7 @@ gtk_text_iter_get_bytes_in_line gtk_text_iter_get_attributes gtk_text_iter_get_language gtk_text_iter_is_end -gtk_text_iter_is_first +gtk_text_iter_is_start gtk_text_iter_forward_char gtk_text_iter_backward_char gtk_text_iter_forward_chars @@ -2192,6 +2203,8 @@ gtk_text_iter_set_offset gtk_text_iter_set_line gtk_text_iter_set_line_offset gtk_text_iter_set_line_index +gtk_text_iter_set_visible_line_index +gtk_text_iter_set_visible_line_offset gtk_text_iter_forward_to_end gtk_text_iter_forward_to_line_end gtk_text_iter_forward_to_tag_toggle @@ -2412,11 +2425,7 @@ gtk_toolbar_prepend_widget gtk_toolbar_insert_widget gtk_toolbar_set_orientation gtk_toolbar_set_style -gtk_toolbar_set_space_size -gtk_toolbar_set_space_style gtk_toolbar_set_tooltips -gtk_toolbar_set_button_relief -gtk_toolbar_get_button_relief gtk_toolbar_insert_stock gtk_toolbar_set_icon_size @@ -3083,7 +3092,7 @@ gtk_widget_send_expose gtk_widget_style_get gtk_widget_style_get_property gtk_widget_style_get_valist - +gtk_widget_get_accessible gtk_requisition_copy gtk_requisition_free @@ -3135,9 +3144,7 @@ gtk_window_unmaximize gtk_window_begin_resize_drag gtk_window_begin_move_drag gtk_window_set_decorated -gtk_window_set_decorations_hint gtk_window_set_frame_dimensions -gtk_window_set_functions_hint gtk_window_set_has_frame gtk_window_set_mnemonic_modifier gtk_window_set_role diff --git a/docs/reference/gtk/tmpl/gtkcolorsel.sgml b/docs/reference/gtk/tmpl/gtkcolorsel.sgml index 8b3be58761..e5022fe900 100644 --- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml +++ b/docs/reference/gtk/tmpl/gtkcolorsel.sgml @@ -64,6 +64,157 @@ time. @policy: a #GtkUpdateType value indicating the desired policy. + + + + + +@colorsel: +@has_opacity: + +@use_opacity: + + + + + + + +@colorsel: +@Returns: + + + + + + + +@colorsel: +@has_palette: + +@use_palette: + + + + + + + +@colorsel: +@Returns: + + + + + + + +@colorsel: +@Returns: + + + + + + + +@colorsel: +@alpha: + + + + + + + +@colorsel: +@color: + + + + + + + +@colorsel: +@color: + + + + + + + +@colorsel: +@Returns: + + + + + + + +@colorsel: +@alpha: + + + + + + + +@colorsel: +@color: + + + + + + + +@colorsel: +@color: + + + + + + + +@colorsel: +@Returns: + + + + + + + +@str: +@colors: +@n_colors: +@Returns: + + + + + + + +@colors: +@n_colors: +@Returns: + + + + + + + +@func: +@Returns: + + Sets the color in the #GtkColorSelection. The widgets are updated @@ -85,15 +236,6 @@ Retrieve the currently selected color value. blue, and opacity. - - - - - -@colorsel: -@Returns: - - This signal is emitted when the color changes in the #GtkColorSelection diff --git a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml index caa1aae51d..394dcd4b10 100644 --- a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml +++ b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml @@ -91,7 +91,7 @@ should be accessed using the functions below. Create a new drawing area. -@Returns: +@Returns: a new #GtkDrawingArea diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml index ab9c7500b1..01b1162c81 100644 --- a/docs/reference/gtk/tmpl/gtkenums.sgml +++ b/docs/reference/gtk/tmpl/gtkenums.sgml @@ -167,12 +167,12 @@ Used for justifying the text inside a #GtkLabel widget. (See also -Used for packing widgets into #GtkBox widgets. (See also: #GtkVBox, +Represents the packing location #GtkBox children. (See: #GtkVBox, #GtkHBox, and #GtkButtonBox). -@GTK_PACK_START: The -@GTK_PACK_END: +@GTK_PACK_START: The child is packed into the start of the box +@GTK_PACK_END: The child is packed into the end of the box @@ -314,13 +314,16 @@ Indicates the direction a sub-menu will appear. -Used to customize the appearance of a #GtkToolbar. +Used to customize the appearance of a #GtkToolbar. Note that +setting the toolbar style overrides the user's preferences +for the default toolbar style. -@GTK_TOOLBAR_ICONS: Buttons should display only icons in the toolbar. -@GTK_TOOLBAR_TEXT: Buttons should display only text labels in the toolbar. -@GTK_TOOLBAR_BOTH: Buttons should display text and icons in the toolbar. -@GTK_TOOLBAR_BOTH_HORIZ: +@GTK_TOOLBAR_ICONS: Buttons display only icons in the toolbar. +@GTK_TOOLBAR_TEXT: Buttons display only text labels in the toolbar. +@GTK_TOOLBAR_BOTH: Buttons display text and icons in the toolbar. +@GTK_TOOLBAR_BOTH_HORIZ: Buttons display icons and text alongside each +other, rather than vertically stacked @@ -358,22 +361,29 @@ Window placement can be influenced using this enumeration. @GTK_WIN_POS_NONE: No influence is made on placement. @GTK_WIN_POS_CENTER: Windows should be placed in the center of the screen. @GTK_WIN_POS_MOUSE: Windows should be placed at the current mouse position. -@GTK_WIN_POS_CENTER_ALWAYS: -@GTK_WIN_POS_CENTER_ON_PARENT: +@GTK_WIN_POS_CENTER_ALWAYS: Keep window centered as it changes size, etc. +@GTK_WIN_POS_CENTER_ON_PARENT: Center the window on its transient +parent (see gtk_window_set_transient_for()). -A #GtkWindow can be of these types. A toplevel window has standard window -decorations by default. A dialog may have fewer decorations and obey a -different placement policy. A popup window will have no decorations. - - -It should be noted that such decorations can often be over-ridden by modern -window managers. - - -@GTK_WINDOW_TOPLEVEL: A window for a typical application. -@GTK_WINDOW_POPUP: A window for popups. +A #GtkWindow can be one of these types. Most things you'd consider a +"window" should have type #GTK_WINDOW_TOPLEVEL; windows with this type +are managed by the window manager and have a frame by default (call +gtk_window_set_decorated() to toggle the frame). Windows with type +#GTK_WINDOW_POPUP are ignored by the window manager; window manager +keybindings won't work on them, the window manager won't decorate the +window with a frame, many GTK+ features that rely on the window +manager will not work (e.g. resize grips and +maximization/minimization). #GTK_WINDOW_POPUP is used to implement +widgets such as #GtkMenu or tooltips that you normally don't think of +as windows per se. Nearly all windows should be #GTK_WINDOW_TOPLEVEL. +In particular, do not use #GTK_WINDOW_POPUP just to turn off +the window borders; use gtk_window_set_decorated() for that. + + +@GTK_WINDOW_TOPLEVEL: A regular window, such as a dialog. +@GTK_WINDOW_POPUP: A special window such as a tooltip. diff --git a/docs/reference/gtk/tmpl/gtkhruler.sgml b/docs/reference/gtk/tmpl/gtkhruler.sgml index ef99f9b00b..524bdfc4d0 100644 --- a/docs/reference/gtk/tmpl/gtkhruler.sgml +++ b/docs/reference/gtk/tmpl/gtkhruler.sgml @@ -40,6 +40,6 @@ with the functions below. Creates a new horizontal ruler. -@Returns: the new GTKHRuler. +@Returns: a new #GtkHRuler. diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml index 67e5d22ae6..d235388b61 100644 --- a/docs/reference/gtk/tmpl/gtkimage.sgml +++ b/docs/reference/gtk/tmpl/gtkimage.sgml @@ -95,6 +95,15 @@ return %NULL values. @size: + + + + + +@image: +@Returns: + + @@ -162,6 +171,15 @@ return %NULL values. @Returns: + + + + + +@animation: +@Returns: + + @@ -220,6 +238,15 @@ return %NULL values. @size: + + + + + +@image: +@animation: + + Creates the new GtkImage using the value and the mask. diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml index 9f048eb50e..40034f6f44 100644 --- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml @@ -49,7 +49,7 @@ Creates a new #GtkMenuItem. -Creates a new #GtkMenuItem whose child is a simple #GtlLabel. +Creates a new #GtkMenuItem whose child is a #GtkLabel. @label: the text for the label diff --git a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml index 56a293cdde..9d347c165a 100644 --- a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml @@ -46,7 +46,7 @@ for(i = 0; i < 5; i++) -The structure contains only provate data that must be accessed through +The structure contains only private data that must be accessed through the interface functions. @@ -56,8 +56,8 @@ the interface functions. Creates a new #GtkRadioMenuItem. -@group: the group to wich the radio menu item is to be attached -@Returns: the newly created radio menu item +@group: the group to which the radio menu item is to be attached +@Returns: a new #GtkRadioMenuItem @@ -65,9 +65,9 @@ Creates a new #GtkRadioMenuItem. Creates a new #GtkRadioMenuItem whose child is a simple #GtlLabel. -@group: the group to wich the radio menu item is to be attached +@group: the group to which the radio menu item is to be attached @label: the text for the label -@Returns: the newly created radio menu item +@Returns: a new #GtkRadioMenuItem diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml index 1a5a4f3e27..52c116c266 100644 --- a/docs/reference/gtk/tmpl/gtksignal.sgml +++ b/docs/reference/gtk/tmpl/gtksignal.sgml @@ -289,7 +289,7 @@ you don't want a return value. the callbacks. - + Given the name of the signal and the type of object it connects to, get the signal's identifying integer. Emitting the signal @@ -304,7 +304,7 @@ It also tries the ancestors of the given type. @Returns: the signal's identifying number, or 0 if no signal was found. - + Given the signal's identifier, find its name. @@ -381,7 +381,7 @@ an array of GtkArgs instead of using C's varargs mechanism. followed by one which is a pointer to the return type. - + This function aborts a signal's current emission. @@ -415,7 +415,7 @@ except it will lookup the signal id for you. @name: the name of the signal you wish to stop. - + Attach a function pointer and user data to a signal for a particular object. @@ -467,7 +467,7 @@ is getting pressed, this is that button. @d: - + Attach a function pointer and user data to a signal so that this handler will be called after the other handlers. @@ -485,7 +485,7 @@ so that this handler will be called after the other handlers. @d: - + This function is for registering a callback that will call another object's callback. That is, @@ -520,7 +520,7 @@ really pass any gpointer as the #slot_object .) @d: - + Attach a signal hook to a signal, passing in an alternate object as the first parameter, and guaranteeing @@ -626,7 +626,7 @@ should signal the removal of this signal. @name: name of the signal. - + Destroy a user-defined handler connection. @@ -635,7 +635,7 @@ Destroy a user-defined handler connection. @handler_id: the connection id. - + Destroy all connections for a particular object, with the given function-pointer and user-data. @@ -650,7 +650,7 @@ the given function-pointer and user-data. @d: - + Destroy all connections for a particular object, with the given user-data. @@ -663,7 +663,7 @@ the given user-data. @d: - + Prevent an user-defined handler from being invoked. All other signal processing will go on as normal, but this particular @@ -674,7 +674,7 @@ handler will ignore it. @handler_id: the connection id. - + Prevent a user-defined handler from being invoked, by reference to the user-defined handler's function pointer and user data. (It may result in @@ -690,7 +690,7 @@ multiple hooks being blocked, if you've called connect multiple times.) @d: - + Prevent all user-defined handlers with a certain user data from being invoked. @@ -702,7 +702,7 @@ Prevent all user-defined handlers with a certain user data from being invoked. @d: - + Undo a block, by connection id. Note that undoing a block doesn't necessarily make the hook callable, because if you block a @@ -714,7 +714,7 @@ hook twice, you must unblock it twice. gtk_signal_connect(), etc. - + Undo a block, by function pointer and data. Note that undoing a block doesn't @@ -731,7 +731,7 @@ hook twice, you must unblock it twice. @d: - + Undo block(s), to all signals for a particular object with a particular user-data pointer @@ -744,7 +744,7 @@ with a particular user-data pointer @d: - + Returns a connection id corresponding to a given signal id and object. @@ -766,7 +766,7 @@ handler. @b: - + Returns a connection id corresponding to a given signal id, object, function pointer and user data. diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml index 196b97f202..b35a294dd7 100644 --- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml +++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml @@ -393,6 +393,16 @@ types related to the text widget and how they work together. @end_index: + + + + + +@buffer: +@start: +@end: + + diff --git a/docs/reference/gtk/tmpl/gtktextiter.sgml b/docs/reference/gtk/tmpl/gtktextiter.sgml index a7d68099e0..33f05398fc 100644 --- a/docs/reference/gtk/tmpl/gtktextiter.sgml +++ b/docs/reference/gtk/tmpl/gtktextiter.sgml @@ -106,6 +106,24 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@Returns: + + @@ -378,6 +396,15 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + @@ -604,6 +631,24 @@ types related to the text widget and how they work together. @byte_on_line: + + + + + +@iter: +@byte_on_line: + + + + + + + +@iter: +@char_on_line: + + diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml index 6295e2dfa1..e6a3ad7abf 100644 --- a/docs/reference/gtk/tmpl/gtktypeutils.sgml +++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml @@ -560,7 +560,7 @@ Create a new, unique type. @type_info: must not be null, and @type_info->type_name must also not be null. - + @@ -568,7 +568,7 @@ Create a new, unique type. @Returns: a pointer to the name of a type, or NULL if it has none. - + Get the internal representation of a type given its name. @@ -577,7 +577,7 @@ Get the internal representation of a type given its name. @Returns: a GtkType - + @@ -608,7 +608,7 @@ has all the proper initializers called. @Returns: gpointer to a GtkTypeObject - + Look in the type hierarchy to see if @type has @is_a_type among its ancestors. Do so with a simple lookup, not a loop. diff --git a/docs/reference/gtk/tmpl/gtkvruler.sgml b/docs/reference/gtk/tmpl/gtkvruler.sgml index 15f4980121..ee07fc9852 100644 --- a/docs/reference/gtk/tmpl/gtkvruler.sgml +++ b/docs/reference/gtk/tmpl/gtkvruler.sgml @@ -40,6 +40,6 @@ using the functions below. Creates a new vertical ruler -@Returns: the new GTKVRuler. +@Returns: a new #GtkVRuler. diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index ff6a10f9e3..e8e7457313 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -1322,6 +1322,15 @@ GtkWidget @var_args: + + + + + +@widget: +@Returns: + + diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 4f1e61ac4f..f14e2654d9 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1875,7 +1875,7 @@ gtk_color_selection_finalize (GObject *object) * * Creates a new GtkColorSelection. * - * Return value: The new GtkColorSelection. + * Return value: a new #GtkColorSelection **/ GtkWidget * gtk_color_selection_new (void) diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h index 85d1328d6b..5be93e2696 100644 --- a/gtk/gtkcolorsel.h +++ b/gtk/gtkcolorsel.h @@ -74,10 +74,10 @@ void gtk_color_selection_set_update_policy (GtkColorSelection *color GtkUpdateType policy); gboolean gtk_color_selection_get_has_opacity_control (GtkColorSelection *colorsel); void gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel, - gboolean use_opacity); + gboolean has_opacity); gboolean gtk_color_selection_get_has_palette (GtkColorSelection *colorsel); void gtk_color_selection_set_has_palette (GtkColorSelection *colorsel, - gboolean use_palette); + gboolean has_palette); void gtk_color_selection_set_current_color (GtkColorSelection *colorsel, diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index e5890a16c4..bf972cb9a8 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -230,9 +230,11 @@ gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf) * @size: a stock icon size * * Creates a #GtkImage displaying a stock icon. Sample stock icon - * names are #GTK_STOCK_ICON_OPEN, #GTK_STOCK_ICON_EXIT. Sample stock sizes + * names are #GTK_STOCK_OPEN, #GTK_STOCK_EXIT. Sample stock sizes * are #GTK_ICON_SIZE_MENU, #GTK_ICON_SIZE_SMALL_TOOLBAR. If the stock * icon name isn't known, a "broken image" icon will be displayed instead. + * You can register your own stock icon names, see + * gtk_icon_factory_add_default() and gtk_icon_factory_add(). * * Return value: a new #GtkImage displaying the stock icon **/ -- 2.30.2